Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 00:05:57 +0000 (17:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 00:05:57 +0000 (17:05 -0700)
commit058404f07323ae929b55c4c31324248138d83b23
tree78d69e7d1c94e9e0a45d95d359562036843a380c
parent170d38ddd2811ba715adc8a04fe4050acb281b13
parente2975ce61e6dcf7b733fc8b81e0cd3c644972abb
Merge from trunk.